Merge "Remove gson depdency from SystemUISharedLib" into tm-qpr-dev