Merge "Change unfold background color based on split screen state" into udc-dev