Merge "Add the exception case for window rotation." into devel/master