More UX changes

Bug: 56014
Change-Id: I064964b8a8ceb857341b962e93f8405d3d195e02
Merge "More UX changes"