Merge "Keep the notification shade open for smart replies" into pi-dev
am: f87b98880e

Change-Id: Ia5107c63863d58aa2b4d88dfb54272a811849c0a