Merge "Fix enrolled face id can't be deleted when changing device rotation then pressing back key" into main