Fix more truncated app label issues.

While I'm at it, fix a bug with the new app header while we wait for
the proper fix to merge.

Test: See untruncated app label.
Change-Id: I7094ec3b4b0a9723ea482b88d6b65766572e88e9