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

Change-Id: I486f4d5500e01570255af814bf53cf5e42ca9c06