Merge "Fixing old bug with AdapterViewFlipper"