Merge "Add taskbarIconSize to GridOption/DisplayOptions" into tm-qpr-dev