Merge "Fix click and long click lock behavior" into qt-dev