Merge "Hide activities when AOD comes in" into pi-dev