Merge "Don't override activity display adjustments with app config" into rvc-dev am: 10e5f365 am: c568513a am: 3fe8a8e8 Change-Id: I33e2cab965205ba1530a9a1cd9fc0d552e53de59