Merge "Count isActivityEmbedded() state to show split screen warning dialog" into udc-dev