Merge "Update notification settings animation" into qt-dev