Merge "Fixed that the HUN layout could be visible on Keyguard" into nyc-mr2-dev am: 9c95a9ccc6
am: bbed7fcf51  -s ours

Change-Id: Ie7a9edce4b25f439653e9caaa3997a722c84296c