Merge "Revive the "Optimizing apps" dialog" into nyc-dev