Merge "Fix Token name onThmeAppRing to themNotif." into main