Merge "Optimize latency when closing panel with animation" into oc-dev am: 6c0aba7d4f
am: 8f1511e91a

Change-Id: I3a34ff4e1214836bf7250f2ade2ae4e8108a65f1