Merge "Restore landscape spacing post frameworks fix" into rvc-dev am: a05598dc am: 88502ffd am: 0acbc2aa am: 487d6e56 Change-Id: I60862607ef7669e37732764a16aae1c490dd77da