Merge "Fix crash from battery saver switch" into nyc-dev