Merge "FP2-505:New message notification doesn't disappear." into fp2-dev-v2