Merge "Fix settings ui tests in abvt suite"