Merge "Force relayout at completion of status bar animation" into klp-dev