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

Change-Id: I0555a5864966805bbea0bd8c0ecd8c38c09d3c19