am 6e158a2b: am 18e12147: Merge "Tighten up the KG transport control layout...
am 6e158a2b: am 18e12147: Merge "Tighten up the KG transport control layout for stability" into klp-dev
* commit '6e158a2b':
Tighten up the KG transport control layout for stability