Merge "Optimize latency when closing panel with animation" into oc-dev