Merge "Correct null UserHandle handling for ACTION_CHANGE_DEFAULT" into tm-dev