Merge "Fix battery robo test" into qt-dev