Merge "Make onClickHandler in KeyguardHostView a weak reference" into klp-dev