Merge "Manage/History buttons should be multiuser aware" into rvc-dev am: 32c36ff2 am: c5593e8f am: 653834e4 am: f01da0b1 Change-Id: I5b1d9577a4b40b3833a759870b895b1885780d2a