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

* commit 'e5d29e50cc27a1ed3e3b257860670b0ea787295b':
  Fix Layout For Small Devices