Merge "VolumeManager: limit the scope of remountUid post fork."