Merge "Move NSSL to a separate layout file." into tm-qpr-dev