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

Change-Id: I3ca3cd01183fa5a8a7626aa0ab0b9f416ff016aa