trim comments, set layout's name after include, and correct an include and key

First patch trims some unneeded comments, harmonizes whitespace, and sets a layout's name after including another layout.

The second patch corrects an includes statement and a key assignment.

Both patches affect a single Nokia vendor file.