Update changes
Make notification non flickering
Merge remote-tracking branch 'upstream/master'