Merge "Fix 5433466 - FU out of position during orientation change" into ics-mr0