Merge "Calculate max bounds correctly in winscope" into rvc-dev