Merge "Perform layout and invalidation after bringChildToFront()" into klp-dev