Merge "notification drag down fix"