Merge "Turn screenshot corner flow on" into rvc-dev am: 9ffb084059

Change-Id: I2803079da4d6931a77dfcea2f4c9d3746bc38669