am 677687c2: am edbab7b5: Merge "no layout = no visibility" into klp-dev

* commit '677687c20864d4af9c24614f22aae035c0c07ce6':
  no layout = no visibility