Merge "Selectively show zen footer." into mnc-dr-dev