am 8b749f80: (-s ours) am e938bdf2: am e831bfd5: am 1ddcfe84: am 47530108: am 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE]

* commit '8b749f80c5de9cf122aa7b798e27c751c30218f7':
  Fix layout mirroring. [DO NOT MERGE]