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

Change-Id: I7625a3fca059e09218c8c27275636394482ca3ba