PLFENG-1886: fix gadget bugs
Merge remote-tracking branch 'remotes/origin/stable/4.0.x' into feature/PLFENG-1968
Merge remote-tracking branch 'remotes/origin/feature/PLFENG-1968' into feature/PLFENG-1968
Merge remote-tracking branch 'remotes/origin/feature/PLFENG-1968' into feature/PLFENG-1968
PLFENG-1968: update iOS resource bundle files
Merge remote-tracking branch 'remotes/origin/feature/PLFENG-1968' into feature/PLFENG-1968