Merge "Update notification shade text on zen change" into pi-dev