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

Change-Id: I1166fd47e50396f2a5c1159d35f8c27b8e4170bb