Merge "Atom: ResourceConfigurationChanged" into pi-dev