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

Change-Id: I4da07eeb5d08123fe95b5ca608b43e7316bea800