Merge "Fix crash in battery screen" into mnc-dev