Merge "Fix blank tiles on QS rotate" into mnc-dev