Refactor RF tests

Try to minimize random failures by waiting for layout to load
Refactor RF tests

Try to minimize random failures by waiting for compose screen to load
Merge branch 'master' into issue_248