am d2d0e61d: (-s ours) am 7719eb5e: Percentage based layouts. DO NOT MERGE

* commit 'd2d0e61d086b0aa0a6dd2bad08b6ae77a946b8c2':
  Percentage based layouts. DO NOT MERGE