am 7b9a10fe: Merge "Fix effects orientation handling." into ics-mr0

* commit '7b9a10fef160cd452f7905ee52f7b9ac2262faf5':
  Fix effects orientation handling.