Merge "Avoid overlapping snackbar with nav buttons in tablets" into tm-qpr-dev