Changing sample app ID and making shell sample refer to the correct version.