Merge "disable heads up feature in klp." into klp-dev