Merge "galaxys2: enable swipe controls in recovery" into cm-11.0