Align layout to dp grid for landscape
am: dd165d2d7c

Change-Id: I224627063dbab99807a80a97c7de6605fa9e0784