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