Merge "Waiting for reinflating the notifications until the user switched"