Merge "Enable samples browsing in builds." into klp-dev