Merge "Delay closing the notification area after swiping a little closer." into cm-10.1

Change-Id: I21765108c285f0bebd9e2d1fb13454e4490ef3cd