Merge "Remove app pairs when their member apps are uninstalled" into main