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