Merge "Allow grids to specify if we should start align taskbar in 3 button nav." into tm-qpr-dev