OZP-64: Improving functional test async
OZP-692: Fixing keynav test
Merge branch 'master' into feature/ozp-64-preferences-api