Merge "Letterboxing improvements for tabletop mode" into tm-qpr-dev