Merge "Revert "Decide the current user after PHASE_THIRD_PARTY boot phase""