Merge "Remove redundant marginStart for FaceSettings button" into 24D1-dev