Merge "Prevent onPrepared callback from being called twice" into klp-dev