Bug 937336 - Remove where possible explicit frame switching

Change to Persona test
Merge pull request #14827 from bobsilverberg/persona_frames

Bug 937336 - Remove where possible explicit frame switching