RC: Ribbon seperate the swipe ribbons.

Change-Id: I46b48c80895abc653b1fb6c3c6080e1cf4874924
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1