Merge "Fix effects orientation handling." into ics-mr0