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

Change-Id: Ie8d9d8cf377dcd21302a153d210cf9cffa039734