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

Change-Id: I14488940604c73345ec559bacb1cc7e2cf272ca5