Merge "Merge "Fix wrong check in logActionClick" into qt-dev am: 6b98bcd825 am: 3dea0c5849 am: 49e525e1a6"