Merge "Fix issue #3152415: Various confusions in docs about Application" into gingerbread