Merge "Exclude nav bar area from apps bounds when in kids mode" into tm-dev