Development to master merge.

it's not a mistake, but redundant SecondActivity.this can be renamed to just this.