Merge "Fixed an issue where the panel could be stuck tracking" into oc-dev
am: a7a39ea187

Change-Id: I05694e3dc92769270c1a286a69777a1519ba51da