Merge "Removing click delay from hotseat"