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

Change-Id: I47f5ec55e84aae55767d3032bcf04bea257c13c8