Merge "(2/2) Fix settings face enrollment UI layout problem" into tm-qpr-dev