Merge "Keep app in high memory adjust if moving from TOP to FGS" into pi-dev