Merge "Fix NPE in color tint getting bitmap"