Merge "Fix notifications disappearing when shade fully expands." into tm-dev