Merge "Fix the height of NotificationContentView when there's no actions but bubble button" into tm-qpr-dev