Merge "Always call onStateChanged/onControlsChanged from the handler thread" into main