Merge changes I7c4cea89,I009328cd into sc-dev

* changes:
  Fix finding auto revoke switch on smaller screen.
  Freeze rotation to portrait for tests clicking Permissions in app info.