Merge "Stop showing default thumbnail in photo manager"