Merge "Preference panel screen titles don't change on rotate"