Merge "Adjustments to expanded view size and position" into tm-dev