Merge "Check only for apk inside updatable apexes" into main