Merge "DO NOT MERGE Do not kill processes when screen size changes" into pi-dev
am: fcb7982a49

Change-Id: Ie54016e55d4170963f6ccf9603d2bfa2ada30a35