Merge "Update notification shade text on zen change" into pi-dev am: 7468d361e3
am: ab334fd6f6

Change-Id: I79dad6deea669e3953b912e78fcaf5f20511896c