Merge "Don't override activity display adjustments with app config" into rvc-dev am: 10e5f36550 am: c568513a74

Change-Id: I94234fa1f97ddedb00b1c51c8633813cceb58304