[automerger skipped] Merge "DO NOT MERGE Do not kill processes when screen size changes" into pi-dev am: fcb7982a49
am: 49596b8d58  -s ours

Change-Id: I710f31d16166115680f327433fb263d82f43254a