Merge "Ensure bar window state is SHOWING after rotate if visible." into klp-dev