[automerger skipped] DO NOT MERGE Apply scissor in render engine for main display am: cf39b7bcad
am: a51a0d17cc  -s ours

Change-Id: Ia0aa0d8679429fda7e0cc78483bfa68b424dde92