Merge "Don't put non-resizeable activities on secondary displays" into oc-dev