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

* commit '059d89a1a447095deaa80a0378f822cb25547c70':
  Workaround for corner case in TransitionManager