Merge "Fixed issue with screen rotation not working for landscape<->seascape"