Merge "Update Rear Display Mode UX" into main