Merge "Fix a bug in double-swiping panels..." into jb-mr1-dev