This causes 3 changes in layout. 2 I can't track down and 1 is better this way. Change-Id: If4ad5e1d7431b4c2cbaaf9767d78139ef4e2dc44