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