Support e2e in controls activities

Test: manual, check different orientations and nav bar
Fixes: 330435386
Flag: EXEMPT bug fix
Change-Id: Ibb478a19256e5e24b835533e4dd053d9788b1393
7 files changed