Merge "[12/n] Letterbox Education: relayout but don't update surface position when bounds change."