Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev