Merge "Fix issue with wrong content insets immediately after rotation"