Merge "Fix issue that Overview key doesn't work at secondary user"