Merge "Update LeanbackSample app to latest from github" into mnc-dev