[automerger skipped] DO NOT MERGE Kill most processes when display size changes am: 2bd9a25007
am: d4a386588e  -s ours

Change-Id: I775d3dc9d027d7d993ee68456f46038c0cd4c463