Merge "Mergin motorola patch to avoind 0 id for all apps button" into ub-now-master