Merge "Remove SysUI Chooser" into tm-dev