Merge "Handle accessibility button state on user switch" into pi-dev