Merge changes from topic "yukawa-b27859687" into main

* changes:
  Clear additional subtypes upon background APK updates
  Remove an unnecessary null check