Merge "Remove calls to remountUid()."