Merge "Reduce vertical margins in landscape add controls" into rvc-qpr-dev