am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"

* commit '5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5':
  Smooth out AwesomePlayer