Merge "Compatible behavior for non-resizable activity (1/N)"