Merge "Update flags before querying activities when parsing default apps."