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

Change-Id: I104599f679029eb4827ef7d559f0198e7a52197e