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

Change-Id: I941f1a8f9b6ee2c65ee289a159146d5b2ee95dcc