Merge "Follow up CL for heads up notification refactoring" into mnc-dev