Merge "Revert "Don't override activity display adjustments with app config"" into rvc-dev