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

Change-Id: Ifd14b60194469dd30b943264a5f36c1794cc9e7d