Merge "[29/n] Encapsulate Letterbox state in Policy" into main