am 033837dd: Merge "Make fading transitions work better" into klp-dev

* commit '033837dd6bf32b33d9a67d340efd167f94bf80cf':
  Make fading transitions work better