Merge "Don't override child task bounds when rotation changed" into sc-dev