Merge "Fix animation when expand conditional notices in Settings." into nyc-dev