Merge "Internal Framework changes needed by DocumentUI's ScopedAccessProvider:"