Merge "SF: Flatten display containers" into tm-dev