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

Change-Id: I6e0731c0eec8b1d36d10173734f393021df87007