am 8c674fda: Fix layout mirroring. [DO NOT MERGE]

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