Merge "Manage/History buttons should be multiuser aware" into rvc-dev am: 32c36ff2 am: ab1fa0c1 am: 7a0289af am: 25a9a9a7 Change-Id: I1fc9fc89395d70b4a86acf25680d2cb222714a50