Merge "Fix fragment carousel going to wrong scroll position after rotation"