Modified uwp job to run both in mr and nightly, instead of splitting it in two