Merge "Don't constraint view sizes as much" into rvc-dev