Merge "Refactor to pass layout selection criteria to Settings" into 24D1-dev