Merge "Maintain TRANSIENT_*_BAR flags until transient bars hidden." into klp-dev