am cac467b3: Merge "Fix one of the potential ANR issues from AwesomePlayer" into jb-dev

* commit 'cac467b3af9235229522a134d2c57e4fa605ba2f':
  Fix one of the potential ANR issues from AwesomePlayer