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