Merge "Notify surface creation and surface change only after playback is requested" into tm-dev