Merge pull request #1998 from anilgooru/release-6.6.3.a1

Implemented FE for [System - Setting] Need to show gmail account name where user is connecting to Google Drive.
Fixed compilation erros.
Merge remote-tracking branch 'upstream/release-6.6.3.a1' into release-6.6.3.a1

* upstream/release-6.6.3.a1: