Merge "[AAPM] DisallowInstallUnknownSources: set state after disable" into main