am 4a97976f: am e5d29e50: am e965928b: am 5d3ca886: Merge "Fix Layout For Small Devices" into klp-dev

* commit '4a97976fcd872ddfaa456f7912bfc65270017c07':
  Fix Layout For Small Devices