am 4f836839: am 67ea77ec: Merge "Selectively show zen footer." into mnc-dr-dev

* commit '4f836839c19aed433e7b1913ce05ccb129743fd7':
  Selectively show zen footer.