Merge pull request #9529 from JosJuice/android-broadcast-before-metadata Android: Broadcast update before updating additional metadata
