Merge "Allow per display level private flag control for physical secondary displays" into qt-dev
am: 143a4a6a04

Change-Id: I8a0b5eb3a0cedee428af570af569d1576035f8ac