[automerger skipped] Merge "Add config to disable app tray preview in display size." am: 98a1ebedcd  -s ours am: 4e8e6c3e67
am: 8a25b25da1  -s ours

Change-Id: I0c0d0f338a724cec812d7fcc7e2bc521fc673a35