am 57079dbc: Avoid layout inflation problem

* commit '57079dbcd31d81425e2daf25d4e56ea066f06aa3':
  Avoid layout inflation problem