Merge "Make the content animated together with the app bar" into sc-dev