Merge "Update ViewState value when it's clicked again." into qt-dev