Merge "Refine logic about controlling transient bars"