Merge "Check both content mode and sys decor flag to get system decoration callbacks from window manager." into main