Merge "Bitmapfun Sample: Update for KitKat and clean up some minor bugs." into klp-dev