Merge "Fix keystore demo layout for Nexus 7" into mnc-dev