Merge "Moving touch event into dialog bounds." into klp-dev