Fix jumping watchstar spinner

Change-Id: Ibb6e022b5996f30007785e0c5e0b25e938ce53cd
Merge "Fix jumping watchstar spinner"