Merge "Fix dev settings crash when no OEM unlock service"