am 644696f0: Merge "Workaround for corner case in TransitionManager" into klp-dev

* commit '644696f0a0bee1714868b9e9cf351f1380e68f39':
  Workaround for corner case in TransitionManager