Merge "Support window rotation" into devel/master