Merge "Change containsMount() to look for any user-id."