Merge "Fix issue that Overview key doesn't work at secondary user" am: 5379f47d85 am: da9a9da520 am: 983f30a5a4
am: 279c334633

Change-Id: Ie2d8dd598424c5162ebf1ad29198c0cb33d35065