Merge "exception: Add missing early return for UserNotLoggedIn error page"