Merge "Move OTA package update before fstrim, hide "Optimizing apps" dialog" into nyc-dev