am 9a9e583f: Merge "Update Screen Configuration Tests" into gingerbread

* commit '9a9e583f1e863b55c4a38409d0ee03827bdb4ff3':
  Update Screen Configuration Tests