Merge "Don't let settings button clickable during animation." into main