Merge "Add FSI_CHROME flag" into tm-qpr-dev