Bug: 36097487 Test: Manually tested role swap and UI behavior Change-Id: I5ce520da521e0714001b60164ac850dddbd644c3