Merge "Restore landscape spacing post frameworks fix" into rvc-dev am: a05598dc am: 88502ffd am: 9fd16624 Change-Id: I3ca3cd01183fa5a8a7626aa0ab0b9f416ff016aa