Merge "Enact minimum height requirement for notifications" into tm-qpr-dev