Merge "Inclusive naming of app enumeration changes from R"