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

Change-Id: I386f4614a5b3f1dfbd78363526dae38ca368f558