Merge "Fix a crash in battery settings page" into qt-dev