Merge "Fix Layout For Small Devices" into klp-dev