Merge branch 'FPII-2753' into 'master'

FPII-2753: Update the launcher icon

Change-Id: Ib666be24ddfa76b08595e7546ad411d2968e153f

See merge request !36