Merge "Hold wm lock in ClearOptionsAnimation" into main