Merge "Restore landscape spacing post frameworks fix" into rvc-dev am: a05598dc9a am: 88502ffddd

Change-Id: I3873434ba791ccfcad7faf50c7f9b116a483795d