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