Pull in more QML UI fixes