Merge "Update NotifIconAreaCtrlr if NICRefactor is off" into main