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

* commit '59b7a4ec9ce6e9af3afc5a3e66c7e2f36bd74ab7':
  Fix for transition layout suppression