am be6cf71d: Merge "Tweak visibility logic for inflated view scenarios" into klp-dev

* commit 'be6cf71dc52ce2fdecc5d432abf1b30a1c62e376':
  Tweak visibility logic for inflated view scenarios