Merge "Bitmapfun Sample: Minor updates/fixes." into klp-docs