Merge "Ensuring KeyguardService has the correct user when it starts" into nyc-mr1-dev