Merge "Add config to disable app tray preview in display size."