Merge "Avoid panel "flip" animations when possible."