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

Change-Id: I6be2b5e2fe429c55fdfda549d588e558f150d4e6