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

Change-Id: I36fb69986ab30b14f3040de35cbd9aaa6d7969b1