Merge commit 'fabec4f14a8cf91225b0682720b7c86b09c1dfb5' into HEAD

* commit 'fabec4f14a8cf91225b0682720b7c86b09c1dfb5':
  Fix broken test
Merge commit 'd07cb4ba4e2ee3022ffc9352eefb6c0f38ddf09b' into HEAD

* commit 'd07cb4ba4e2ee3022ffc9352eefb6c0f38ddf09b':
  Fix refresh issue w/ mSecurityFlags preference stored as an int
Merge commit '57f4d0222b0a5647793d7ea14acda055223ea11d' into HEAD

* commit '57f4d0222b0a5647793d7ea14acda055223ea11d':
  Adding 2 utility methods for testing
Fix merge with 42e3f10a9575e277ba6f121e6cac56ddb02fda12