Merge "Check both content mode and sys decor flag to get system decoration...

Merge "Check both content mode and sys decor flag to get system decoration callbacks from window manager. This is needed as there is no guarantee content mode will be enabled everytime sys decor flag is enabled." into main