Merge "Update ViewState value when it's clicked again." into qt-dev am: 4a4bc355e7
am: 410a83b212

Change-Id: Iaf5762bceb06a696c384c1bed4b4d2c439ebe7c7