Merge "Manage/History buttons should be multiuser aware" into rvc-dev am: 32c36ff2 am: ab1fa0c1 am: de629d64 am: 6cd7df7d Change-Id: I0a463b523b0de8c39e023949e6bc6f991dad0993