Merge "Fixes swipe gesture on non-dismissable notifications."