Merge "Don't create one-handed-background-panel after rotation" into sc-dev