Merge "Fix screen state control when user switched"