Merge "Add border space to all apps cells" into tm-dev