QA: refactor to use page objects properly within steps

No change to function, only appearance

Re-using the page object within steps is good practice because
every call to "on(FooPage)" instantiates a new page object. It is more
efficient to re-use one page object within steps.

Change-Id: Ic3ac1bde1797229487c4d66fc08045e53e88365e
Merge "QA: refactor to use page objects properly within steps"