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