Merge "Use CounterRotator for wallpaper animation targets when unlocking" into udc-dev