Merge "Fix preview layout crash upon screen rotation" into sc-dev