Merge "Update toggle layout and always show footer text" into qt-dev