Merge "Apply layout param to NotificationShelf only when needed" into tm-qpr-dev