Merge "Calculate max bounds correctly in winscope" into rvc-dev am: 69939a60d2 am: ca1cc5167b

Change-Id: Ia1f4a40a27c7b95ffbf992d5277940a6a08ce28b