Merge "Fix bug that heads up notification appear even when disable_expand is set" into pi-dev
am: a031ddd687

Change-Id: Ia754701a418a8a69edc06cf8cbfd59a6a8815123