Merge "Don't override activity display adjustments with app config" into rvc-dev am: 10e5f365 am: c568513a am: 4de020ab Change-Id: I0cb826f43b6c6890152d34c77d386b9a0c484ee2