Merge "Add drawable for Apdu Services, fix build." into klp-dev