Merge "Support for activity to opt-in/out of resizeable/multi-window support."