am b7e69d20: Merge change Ic8fe0b36 into eclair

Merge commit 'b7e69d20a42297d0d80a0a0a0f88320d8e536ff5' into eclair-mr2

* commit 'b7e69d20a42297d0d80a0a0a0f88320d8e536ff5':
  Add 3 more rules to layoutopt/uix: