Merge "Fix window rotation sync issue for mulit window" into devel/master