Merge "Improve transient bar transitions." into klp-dev