Merge Fix the flipping animation sometimes being played when pulling the quick settings with two fingers. into cm-10.1

Change-Id: I90ff31a922f5c353166d58c96eea62c7124b2e4a