Merge "Fix flickering issues with FLAG_SHOW_WHEN_LOCKED and fingerprint wake" into nyc-mr1-dev