Merge "UX polish: preview size, toolbar color." into tm-qpr-dev