Fixing small regressions from layout tweaks
am: 11439c5854

Change-Id: Id3d8510a7cff4eb54d6bf1d2fdba837199ed499f