Merge "Replace thin Letterbox policy flag" into 24D1-dev