Merge "Turn off the Always-on a11y service with correct user id" into main