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

Change-Id: I3a059364e71180aa2f35e112d42dd985548507ca