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

Change-Id: I0a463b523b0de8c39e023949e6bc6f991dad0993