Merge "New dialog for ignore battery optimizations" into mnc-dev