am 6ccc6507: Merge "Restore the CAB mode on orientation change" into jb-ub-mail-ur8

* commit '6ccc6507e1d84e80feae8f01bbe2bbac58f129f1':
  Restore the CAB mode on orientation change