Merge "Revert "Showing default activity in activity chooser view only if enough space."" into jb-dev