Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev