Merge "Changes to notification shade." into qt-dev