Merge "Tweak assist disclosure animation" into mnc-dev