Merge "Include work app in battery optimization settings" into nyc-dev