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

Change-Id: I89a0330e3f6b5e3e1145db23adfd860749795408