Merge "Merging motorola's patch to prevent crashes on view id mess up" into ub-now-master