Merge "Disable failing app launch assertion on shell transitions" into tm-dev