Merge "Move ViewFlipperTest to UI Thread"