Merge "Fix NPE in getDisabledCapabilities()"