am 554d8726: (-s ours) am 0776deff: More obsolete status bar bits. DO NOT MERGE

Merge commit '554d8726f8df053c07e0c68e43f060019c11264e'

* commit '554d8726f8df053c07e0c68e43f060019c11264e':
  More obsolete status bar bits. DO NOT MERGE