Merge "Adjust Lock screen message for better accessibility." into pi-dev