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

Change-Id: I28e54e71fae77add11a1d6241ab270922d454a14