Merge "Fix launch animation for PrivacyDialog and reenable dismiss anim" into main