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

Change-Id: Ie161169b4df74c223ab00f15361aa5c0ac4f9ec9