Merge "Reserve the icon space to avoid preference padding change" into tm-qpr-dev