Merge "Adding more modes to the sampler test app. Fixing pixel placement."