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

Change-Id: Ic32b49fa9259949f00c4d1ab68ea321bc5865d50