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