Merge "Wait for ACTION_MEDIA_MOUNTED before removing started users." into tm-dev