Merge "Few cleanups in Launcher.java: 1. Fix static member accessed via...

Merge "Few cleanups in Launcher.java: 1. Fix static member accessed via instance reference 2. Get rid of explicit type arguments 3. Make few instance variables final 4. Get rid of redundant 'public' modifier for interface methods 5. Get rid of an unnecessary return statement" into ub-launcher3-dorval-polish