Merge "Only remountUid when uid is active"