Merge "Refactor for tuning gfx-max-frame-time-99" into pi-dev am: 845e89320d
am: 111dc8257f

Change-Id: I04de20030a208c9529a7035b2465df479f50358a