Merge "Don't resume PowerStatsDataStorage read on Exception" into sc-dev