Merge "apply force hiding of window only when it is main display" into mnc-dev