Merge \\\"QS Edit: Extra extra make sure hidden when locked\\\" into nyc-dev am: fd6e7e67 am: 7399cf0c am: b995b743 Change-Id: I4a68e6325f48706be28ca352fb74794470a32d2a