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

* commit '262e5281d7d678c765ae2500dc05c742946c716b':
  Workaround for corner case in TransitionManager