Merge "Need to check current user when triggering notification lights"