Merge "Squishy ViewState no longer mutates global album art widgetState" into tm-dev