Merge "Manage/History buttons should be multiuser aware" into rvc-dev am: 32c36ff2a5 am: ab1fa0c15f

Change-Id: Iabc9f48df1ade39fbee39ea0852b17e1665e449e