Merge "Track whether SysUI is running fpDetect vs fpAuthenticate" into main