Merge "Put the affordance launch animation back on the renderthread" into nyc-mr1-dev

    @Override

    protected void onDraw(Canvas canvas) {

        mSupportHardware = false;//canvas.isHardwareAccelerated();

        mSupportHardware = canvas.isHardwareAccelerated();

        drawBackgroundCircle(canvas);

        canvas.save();

        canvas.scale(mImageScale, mImageScale, getWidth() / 2, getHeight() / 2);