Merge "Fix 2363699 - Make notification shade animate closed when disabled"