Merge "Move user state change handling out of the android.bg" into main