Merge "Ensure OK/Cancel buttons always shown" into rvc-qpr-dev