(cherry picked from commit c5ccb98d5d)
c5ccb98d5d
Fixed inconsistency so preferences get read from the correct source. (cherry picked from commit a74c38bd9f)
a74c38bd9f
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point (cherry picked from commit 48e6a75fbd)
48e6a75fbd