Merge "Update SysUI to use system cache for battery estimates" into qt-dev