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

Change-Id: Ifa1c4fb9aef4c0479600f3ffdc142d1f5b8423df