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