Merge "Force embedded activity resizable" into sc-v2-dev