When DPM is updated while lock screen is inhibited, don't
unconditionally enable lock screen.

Change-Id: Iab2af06eb8e41fbcfc6adfbeb5b42a9bbf446fe9
Delay closing the notification area after swiping a little closer.

Use the same value as when removing all notifications.

Change-Id: Id11a48bc47487fd7763503dcbc769d9dbf5ad16a
Merge "Delay closing the notification area after swiping a little closer." into cm-10.1
Merge "When DPM is updated while lock screen is inhibited, don't unconditionally enable lock screen." into cm-10.1
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1