Merge "HfaActivation should support UI and no-UI modes." into klp-dev