Merge "Remove drop shadow below on the fill dialog" into tm-dev