am 9f7136e9: am 59b7a4ec: Merge "Fix for transition layout suppression" into klp-dev

* commit '9f7136e9632a2fa4b8f8b5eaae300b5b104d7807':
  Fix for transition layout suppression