Merge "Samples: Fix bugs in Note Pad sample app."