am 5d3ca886: Merge "Fix Layout For Small Devices" into klp-dev

* commit '5d3ca886441cf214b62daaabad4856c1c0ffef37':
  Fix Layout For Small Devices