Merge "Close notification guts after applying changes" into qt-dev
am: 2cf73d7976

Change-Id: I6dc3a01456b69529f505879d2db3dd670b7ead20