* Fixes bug 44992 * Improvements to click event handling Change-Id: I2146340051b937cb51e7f296fd947262c781d712