Merge "Heads up notification can now scroll away after it was seen"