Merge "Support non-resizeable activities on secondary displays"