Merge "Fix notifications transitioning from small->big."