am f88e4087: Merge "Remove collapsed headers for tablet only" into jb-ub-mail-ur9

* commit 'f88e408767feba2fd4974d0dddafebc3964cea03':
  Remove collapsed headers for tablet only