Design change for UX improvement. Bug: 156629343 Test: manual visual Change-Id: I4ff89eec472de699d1fa723d8369ad99b78a83a3